Revert 13e681e..a3b9a10

This rolls back to commit 13e681e9d5df8b24a2b9bcdc12e8e699d3b113a1.