Revert 24278a4..8ee5b23

This rolls back to commit 24278a4feb97a2cd4be18bbb249d46554f0fb4d5.
Revert 1a71f20..12b6528

This rolls back to commit 1a71f20497c9de2a3451b0fc1feacc61e9bbaefc.