Rollback changes introduced in c27cc5d