Revert "Build configuration update"

This reverts commit 6d6471e2ee7f3a68e6979ea1ecd5c335cbf5eded.