Reverting while waiting for PR to be merged