Revert 0ea12c8..4e1b071

This rolls back to commit 0ea12c8f8dd574031fffa54e072e0e2069b526e5.