Reverted change, will implement fuller fix tonight