Revert 8ccf095..74ddea8

This rolls back to commit 8ccf095842cfb3fcc4b3c655b4cd3acf076e3049.