Revert d9f375e..e7d1bda

This rolls back to commit d9f375e28d184802cf77ad7183ef1b3e19e7ffa8.