Revert 47b5ae6..aa11498

This rolls back to commit 47b5ae6c9c9a83a186cb17cac5a7a89a343e1fd4.