This had been already dropped in commit 1d60f46f, which was reverted in commit 8ba8a29c. At least that part of it was correct though.