Revert a8cbea9..4c3ce07

This rolls back to commit a8cbea9969fc2e32def9e1cfbf4c2ee39b8b946e.