Revert d4501da..c3ef171

This rolls back to commit d4501da77335fa064e3ca02702d31000b0a698b9.