Revert acfeea2..1e42d1c

This rolls back to commit acfeea2ac93b339aed197a6bbbf57bc17fc02e6a.
Revert 4981b4f..d269a1f

This rolls back to commit 4981b4f12133205627759ad16524069b42fe00b7.
Back to square one but removed all translate3d