Revert 906b0aa..c487f35

This rolls back to commit 906b0aae339f768191f27a918290d083923447d3.