Revert 2a8757a..69ae168

This rolls back to commit 2a8757addb449d4140aa5c82e91327721c5d5566.