Reverted 771bc3f995abd5e5b4c70ca267461c7d7da09058 and d5be943d93f1c87d301bc2412618d2a1022d75d0