Revert e8b5419..b7405eb

This rolls back to commit e8b5419cf932af50c5c7b7141ba759115b2e2361.