Reverted the revert ;)