Revert 7fb9a5d..677695d

This rolls back to commit 7fb9a5dfa673c4187d9effac5d20fe76880bdae2.