Revert 965c8b4..21f76df

This rolls back to commit 965c8b4d9c4008b50b34429c51123532b3c47381.