Revert d9f1bca..e69402f

This rolls back to commit d9f1bcacf9331ee944c557cf4107f47fc28bada2.