squashed revert of smelly blitter stuff

Change-Id: Iea1d98f7e512a63a82a0ad5c17ede7a6b39468dc