Revert 43feddc..265c3bc

This rolls back to commit 43feddc49a009a21905abae50b61d84a5966249d.