Revert 4d79ff8..1efca2f

This rolls back to commit 4d79ff8d0ea34d757916483d9d610cfea28f1e87.