Revert a2aea15..669d7a2

This rolls back to commit a2aea153c8f9f3b2dfc059ef0696f87f08fdab94.