Following comment in #1505, this reverts the following commits: * 0a231a6575 * 73747db980 * 77a95b0e86
0a231a6575
73747db980
77a95b0e86