Revert 8f93aba..7fa79ed

This rolls back to commit 8f93abafe037f37655cc7f3a268557d27d636fd7.