Reverting patch

It seems the previous patch was creating more problems than it solved. Reverting to a stable version. Apologies for any inconvenience.