Revert a6bb06f..66ea71d

This rolls back to commit a6bb06f8e7192ef30fcd3f73ac28778fbe4c0bd4.