Revert ac666aa..ae6c3e3

This rolls back to commit ac666aac972daa798c9b06ddcbdff03935ac45ea.