Revert 863c171..65435a8

This rolls back to commit 863c171340a249b5856825838f2bbdd05a24f0a9.