This was reverted in d6a0ede