Revert 37feeab..cffbaa4

This rolls back to commit 37feeab9e29aa566497d2329c545e166ab09ae3f.