Revert efd325f..3853146

This rolls back to commit efd325f728bfaa2cae59947b5274ff685d9bac91.