Revert a006f40..8519321

This rolls back to commit a006f40709a1dc5ca2037ba46e568090a1208752.