This reverts commit 9dd5f076ea which was a revert itself so we are back to the state before those two reverts. The problem that caused revert that happened in 9dd5f076ea has been fixed in 88061dd262.
9dd5f076ea
88061dd262