Revert 6ec6a9d..d9a0a85

This rolls back to commit 6ec6a9d3a17471ddc56333f557808661524e47a2.