Revert 7f4516b..f233bd2

This rolls back to commit 7f4516bef4c73a32a78fea0deea6f35ce7c3036e.