Revert "Removing legacy promotion path"

This reverts commit 4f23651490a6b79634c5315e2082ba1ea50a90a5.
Merge pull request #23 from daviddavis/temp_1368458947

Re-adding legacy promotion to master