Reverted recent changes