Revert 2ecc223..908d054

This rolls back to commit 2ecc22398116ecd7d52391f4d132ff3c7c6d5d2e.