Revert a755884..a37b5b5

This rolls back to commit a7558846b8fcf4cefa58b81b638c2ffbcbf47963.
syncing with medusa version