Revert f87d61e..b59d025

This rolls back to commit f87d61e1ac727fce1f58e9da7f0dfb4c66cfac17.