Revert 3457a73..203023f

This rolls back to commit 3457a73d1a520c5a00273fd901c1dad45390d796.