Revert 2a4b9ef..64703ed

This rolls back to commit 2a4b9ef58f60602905ec90e0871201e7507960c4.