Revert "tentative fix at pixel alignment issues"