Revert cddb12d..436103f

This rolls back to commit cddb12d9a9f9609554eb0533a0d517ffd9757168.