Revert "Merge pull request #507 from rase-/smooth-resize"

This reverts commit f6394a8a62be15570cce80911f0ac52c6480219b, reversing
changes made to 2d740e2917a74bca7898ce55db91176f258e64bf due to conflicts
with #499.