Revert 3098f44..eb99497

This rolls back to commit 3098f44aa5b972e4002122f3ebc5f9cf54e0ee59.