Revert 5b4b820..f980aa6

This rolls back to commit 5b4b8204c4d897c8956766e4a33cbce6f83e2ca5.
cropping added