Revert "Pre-master commit"

This reverts commit 97a70660c0c75ea2b9a94395ace547ba5d0f6592, reversing
changes made to 28317356db0c8b391c529e539a90c41e7cc79472.