Revert 5a0a874..12298e3

This rolls back to commit 5a0a874a47b4534874ad86a21c66e73e92691d7e.