Revert 5277543..1860083

This rolls back to commit 5277543a2023b9d7f067db8485f98e9d53d0c4fb.