Revert 7267316..d6d05ec

This rolls back to commit 72673168e9fece26e403108a92560cf4250def7e.