Revert 42c5146..3b7cebb

This rolls back to commit 42c5146a571947ebd04eff9ad043fd9278490a71.