Revert 0c55e94..cc1eb27

This rolls back to commit 0c55e9499546761b1b9ccc4215c72e9471f398b1.