Revert be43134..0ac749f

This rolls back to commit be431342c198eaa5145f8c0ab3c3c78ab3f14bc2.