Revert 933af57..af6a718

This rolls back to commit 933af579a3f63ed3e8588dda7a8f2823437a226f.
conflict resolutions