Revert 4a84a92..1468629

This rolls back to commit 4a84a92137c2e5bd01a92cb2c0b78998bc8bae6c.
Revert 1468629..cbf6238

This rolls back to commit 14686291c951a975a77fb2142aea9fa12e0d7250.