Merge pull request #4297 from frappe/revert-4294-develop

Revert b28573ab03e7216a0c3512879afa87af8e902f4b