
This reverts commit 3bddb5538528c19388e364d21e6a6c16487af759. Fixes #1341 (cherry picked from commit eb3bea8150ce9bf2320d15c879cbebaa6d51a4c6)
This reverts commit 3bddb5538528c19388e364d21e6a6c16487af759. Fixes #1341 (cherry picked from commit eb3bea8150ce9bf2320d15c879cbebaa6d51a4c6)