Revert 0adbbe1..659056b

This rolls back to commit 0adbbe102b1f06731142c6513f868e7bfa6c1a7e.