Revert 0f7752d..ef17057

This rolls back to commit 0f7752d02e59b7cab9dd4b0804b9253cae6a9e49.