Revert cac4011..14680ee

This rolls back to commit cac4011ca52c801d32511be52621e8ab6a455f6b.