Revert 1c319b8..42c83e2

This rolls back to commit 1c319b85d19c4338865d9ac4551283cbdb757709.