Reverted recent change