Revert "Merge pull request #3147 from aeslaughter/auxbcs-3021"

This reverts commit aaa219b7fa6370a0bdc58a74b6f76ab22d312f3d, reversing
changes made to 5613ebb783ccf5c1550ea1ba3321c0336f49f013.
Merge commit 'fc3b73093db2723b3ad6bc930d33c35530fd61c5'