Revert 396ff4a..a8e492f

This rolls back to commit 396ff4aedea88d04e8de02ebe403f9f1b84614ad.