Revert e6caa68..3b24c8b

This rolls back to commit e6caa68be178ff0ed2f1083ca42c9569af8d0295.