Revert f150a66..35a8c7d

This rolls back to commit f150a660260c5e1c1b8bc2f81ea9180133c7e2f6.