Revert 0d1a6c5..a5b2e2e

This rolls back to commit 0d1a6c5b0b21b43f990c244132c8a475cbdf0477.