Revert b7fa16a