Revert 5b47c67..18342bf

This rolls back to commit 5b47c675336c5d72da4b13ddd4b1111339068b01.