Revert a8183a6..087d43a

This rolls back to commit a8183a68628ad93c01c8e5c4fece3a4cad05f5ee.