Reverted to previous code base

Reverted to the previous code base of S4E due to bundling
incompatibilities.