Revert c7b9288..67b2f40

This rolls back to commit c7b9288c618f927d7a2431cb3df1aebe774ebc24.