Reverse merge

Reverse merge of #1