Revert b311e42..f4b0dba

This rolls back to commit b311e4282b67bf62c532da7ac324ebf817820486.