Revert 5457a01..9949a6c

This rolls back to commit 5457a01bd5227d8790028d8e99317732c8c207cf.