Revert a9730a2..a8b17d6

This rolls back to commit a9730a2364b5979ea5f0dbd369535538b4261908.