Revert af7593b..d802e22

This rolls back to commit af7593b203407506cf9bdf9d8d9acf50008fa2de.