diff --git a/indra/llcommon/llalignedarray.h b/indra/llcommon/llalignedarray.h
index 964b6d87a..14e25e78d 100644
--- a/indra/llcommon/llalignedarray.h
+++ b/indra/llcommon/llalignedarray.h
@@ -41,7 +41,11 @@ public:
 	~LLAlignedArray();
 
 	void push_back(const T& elem);
-	U32 size() const { return mElementCount; }
+	void pop_back()				{ if(!!mElementCount) --mElementCount; }
+	bool empty()	const		{ return !mElementCount; }
+	T& front()					{ return operator[](0); }
+	T& back()					{ return operator[](mElementCount-1); }
+	U32 size()		const		{ return mElementCount; }
 	void resize(U32 size);
 	T* append(S32 N);
 	T& operator[](int idx);
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 5d73c2e8f..084f9780c 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -663,14 +663,6 @@ void  LLPrivateMemoryPoolTester::operator delete[](void* addr)
 #endif
 #endif
 
-LL_COMMON_API void ll_assert_aligned_func(uintptr_t ptr,U32 alignment);
-
-#ifdef SHOW_ASSERT
-#define ll_assert_aligned(ptr,alignment) ll_assert_aligned_func(reinterpret_cast<uintptr_t>(ptr),((U32)alignment))
-#else
-#define ll_assert_aligned(ptr,alignment)
-#endif
-
 //EVENTUALLY REMOVE THESE:
 #include "llpointer.h"
 #include "llsingleton.h"
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index bbf70b9de..782562886 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1496,7 +1496,7 @@ void LLRender::translateUI(F32 x, F32 y, F32 z)
 	}
 
 	LLVector4a add(x,y,z);
-	mUIOffset.back()->add(add);
+	mUIOffset.back().add(add);
 }
 
 void LLRender::scaleUI(F32 x, F32 y, F32 z)
@@ -1507,33 +1507,27 @@ void LLRender::scaleUI(F32 x, F32 y, F32 z)
 	}
 
 	LLVector4a scale(x,y,z);
-	mUIScale.back()->mul(scale);
+	mUIScale.back().mul(scale);
 }
 
 void LLRender::pushUIMatrix()
 {
 	if (mUIOffset.empty())
 	{
-		mUIOffset.push_back(static_cast<LLVector4a*>(ll_aligned_malloc_16(sizeof(LLVector4a))));
-		mUIOffset.back()->splat(0.f);
+		mUIOffset.push_back(LLVector4a(0.f));
 	}
 	else
 	{
-		const LLVector4a* last_entry = mUIOffset.back();
-		mUIOffset.push_back(static_cast<LLVector4a*>(ll_aligned_malloc_16(sizeof(LLVector4a))));
-		*mUIOffset.back() = *last_entry;
+		mUIOffset.push_back(mUIOffset.back());
 	}
 	
 	if (mUIScale.empty())
 	{
-		mUIScale.push_back(static_cast<LLVector4a*>(ll_aligned_malloc_16(sizeof(LLVector4a))));
-		mUIScale.back()->splat(1.f);
+		mUIScale.push_back(LLVector4a(1.f));
 	}
 	else
 	{
-		const LLVector4a* last_entry = mUIScale.back();
-		mUIScale.push_back(static_cast<LLVector4a*>(ll_aligned_malloc_16(sizeof(LLVector4a))));
-		*mUIScale.back() = *last_entry;
+		mUIScale.push_back(mUIScale.back());
 	}
 }
 
@@ -1543,9 +1537,7 @@ void LLRender::popUIMatrix()
 	{
 		llerrs << "UI offset stack blown." << llendl;
 	}
-	ll_aligned_free_16(mUIOffset.back());
 	mUIOffset.pop_back();
-	ll_aligned_free_16(mUIScale.back());
 	mUIScale.pop_back();
 }
 
@@ -1555,7 +1547,7 @@ LLVector3 LLRender::getUITranslation()
 	{
 		return LLVector3(0,0,0);
 	}
-	return LLVector3(mUIOffset.back()->getF32ptr());
+	return LLVector3(mUIOffset.back().getF32ptr());
 }
 
 LLVector3 LLRender::getUIScale()
@@ -1564,7 +1556,7 @@ LLVector3 LLRender::getUIScale()
 	{
 		return LLVector3(1,1,1);
 	}
-	return LLVector3(mUIScale.back()->getF32ptr());
+	return LLVector3(mUIScale.back().getF32ptr());
 }
 
 
@@ -1574,8 +1566,8 @@ void LLRender::loadUIIdentity()
 	{
 		llerrs << "Need to push UI translation frame before clearing offset." << llendl;
 	}
-	mUIOffset.back()->splat(0.f);
-	mUIScale.back()->splat(1.f);
+	mUIOffset.back().splat(0.f);
+	mUIScale.back().splat(1.f);
 }
 
 void LLRender::setColorMask(bool writeColor, bool writeAlpha)
@@ -1977,8 +1969,8 @@ void LLRender::vertex4a(const LLVector4a& vertex)
 	else
 	{
 		//LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.back()).scaledVec(mUIScale.back());
-		mVerticesp[mCount].setAdd(vertex,*mUIOffset.back());
-		mVerticesp[mCount].mul(*mUIScale.back());
+		mVerticesp[mCount].setAdd(vertex,mUIOffset.back());
+		mVerticesp[mCount].mul(mUIScale.back());
 	}
 
 	if (mMode == LLRender::QUADS && LLRender::sGLCoreProfile)
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index d8f01a75a..2ca28c669 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -38,6 +38,7 @@
 #include "v3math.h"
 #include "v4coloru.h"
 #include "v4math.h"
+#include "llalignedarray.h"
 #include "llstrider.h"
 #include "llpointer.h"
 #include "llglheaders.h"
@@ -466,9 +467,8 @@ private:
 
 	F32				mMaxAnisotropy;
 
-	std::vector<LLVector4a*> mUIOffset;
-	std::vector<LLVector4a*> mUIScale;
-
+	LLAlignedArray<LLVector4a, 64> mUIOffset;
+	LLAlignedArray<LLVector4a, 64> mUIScale;
 };
 
 extern F32 gGLModelView[16];