Revert a081f03..5a6927a

This rolls back to commit a081f0395e7ac4afcc67a78e5fa77e513f6378c2.