Revert edb2b64..25037f7

This rolls back to commit edb2b641c36025abdaa9464ad056ee7a66a51d4f.