Revert 531ccd2..af98502

This rolls back to commit 531ccd2b8d79d35e230e3aa17da16e33e0827611.