Revert fbc3eab..c0b1564

This rolls back to commit fbc3eab95e7ce0d8a1760ccaa7c692f4253cbea2.