Revert cb544e5..7a64b49

This rolls back to commit cb544e57e71e4048e410837ea436d9aaed692b03.
Revert dd38ab0..95b7124

This rolls back to commit dd38ab07f96a616d5ac57996ba835cb8764d1623.