Revert 2b83145..7d082e4

This rolls back to commit 2b831459e24bb99e3ad11ecfc9b85536f9047009.