Reverted temporary changes