This reverts commit 0b0a5d21ac. The breaking changes in that commit have been postponed to 4.0.
0b0a5d21ac