Revert bae2821..8202f0c

This rolls back to commit bae28219fa284d785194fcacd58ed1a0e1a12b36.
Revert 5a29023..7250739

This rolls back to commit 5a2902376996a51cf268c982051be1e1a8a041a5.