Revert a91a3f2..ab9d838

This rolls back to commit a91a3f2cc7c5c3d344237a3bdd0d0ed52faf0684.