Revert 9ac5a71..a05bb87

This rolls back to commit 9ac5a710f9c3f4f277f8c9e59e6ecbe1febb5e1e.