Revert d5aed1c..3676c4b

This rolls back to commit d5aed1cbf448693da796a007b1552c81a4deca59.