Revert 7eebd69..ac749d5

This rolls back to commit 7eebd69bb0d6aa8ea6fd3136f246b52622df5e7b.