Revert 04a37d7..45159dd

This rolls back to commit 04a37d7e5807f7c62c0bf33d3da9bcf18a1ff05b.