Revert 4652728..2922a63

This rolls back to commit 4652728d9582cb6660a8e49decb0b79b24deca2a.