Revert 0425314..bad52f3

This rolls back to commit 0425314d70cf67aca002f842728187c019901af5.