Revert a3d3440..a959e12

This rolls back to commit a3d34406b4de635c98c5f5ffdd7c3ffa68428221.
Working Version