Revert 24d3bc7..226d76f

This rolls back to commit 24d3bc720c276af96d2b53fa7d68e97da5621079.