Revert c7775b0..b4a63a4

This rolls back to commit c7775b05b9d8d6f1de9c78738431dd66204dc019.