Revert 98d28db..b80baa5

This rolls back to commit 98d28dbc8bde1c71c78f9cace2d8e3c0a473e589.