Reverting back to non-iframe solution.