Revert 5f0c42f..9da99d8

This rolls back to commit 5f0c42f23aadef2a5e087b8668f35c2ee7cdcffa.
Revert 9da99d8..4e503ed

This rolls back to commit 9da99d8d7e9da23356c2b1086bf8389c1f471aa1.