Revert a5bec3f..815976d

This rolls back to commit a5bec3f697abcc7b0023ee55fbf4038bc353efbf.