Revert d639436..e2c4e59

This rolls back to commit d639436ed6c335633b72a2c81affe1e1e3b7d6b1.