Revert 7437892..4bb220e

This rolls back to commit 743789204b87ac7dc8bd6da3afb1971e30423509.