Revert 8e4fe2b..5b7c031

This rolls back to commit 8e4fe2b421fd08665b4e82f0109a31096abbc151.