Revert 8f3767b..64a6c37

This rolls back to commit 8f3767bfaba638485ed84513f0ee3ee3c0c5369e.