Revert ed2358a..0147801

This rolls back to commit ed2358a297fcda1937968194de22be688e2d48f2.