Revert samy revert

Resolving master conflicts