Revert "Temp commit for dev integration"

This reverts commit 229e321b78f0f6348d145c34d14655c321a1cbf0.