Revert 04652b0..cda8e05

This rolls back to commit 04652b01f99926fb8a682c312648c6b0571793cc.
Revert e8f8f6c..09305e0

This rolls back to commit e8f8f6c341b7d17325e32b4f9b35aace067559af.