Revert 6fc4b80..43a60aa

This rolls back to commit 6fc4b8027faad2c6ff96cf86dcd144e29ec3c84c.