Revert 295b70f..016b35f

This rolls back to commit 295b70f200629eaf97762170d8b75a9fe7bf9e75.