Revert 214c264..7c0d77c

This rolls back to commit 214c2648b1513f6a55ac457a91594e2d75dd8637.