Revert 9aae1ae..ca38a11

This rolls back to commit 9aae1ae483a01f80547c0392b5dd42856d3dc62d.