Revert dfc3c90..6012f1b

This rolls back to commit dfc3c90babfbd274b5acf35f4b5b2ba90728c79a.