Revert c6224f6..bf645b4

This rolls back to commit c6224f6acd1e9e1bf0ecd74be6e688358f17026e.
Revert 648f7e9..4997daa

This rolls back to commit 648f7e92be0341f05324a9ced2bd5ba782d8ef12.
bla