Revert 3ebde18..c83f118

This rolls back to commit 3ebde184b73a360de405a70cbba10fadb9e2330f.