Reverted previous change. What was I thinking!