Revert 33b02f7..77294b0

This rolls back to commit 33b02f7d519331fab0147703f3a2fcaa9da13c72.