Revert bcad56d..f7afda9

This rolls back to commit bcad56db94742f11b1b74b8da7f2e950f59ac548.