Revert paint injection and it's classes