Revert "Fix derp for windowmanager service"

This reverts commit 9c936ee264e057da1eb73836fc621e7489086292.