Revert 7a9e7a5..4036f65

This rolls back to commit 7a9e7a52d8535caed25eaeb3dbed459b487a332b.
Back upto pre-dsym error