Revert 85baf54..e2a83f6

This rolls back to commit 85baf54036b9206d04ad20413c06e48dc4e86c92.