Revert "Merge branch '15-test'"

This reverts commit d593946e5d38d2a798349d69082679660358559f.