Changes (reverted from commit 9f82d7e8e1cc4bdec50e8f424911daa8eb0175f2)