Merging delete legacy promotion code into master by reverting reverted code

See #11 and #23 for more info.