Revert "workaround for ace"

This reverts commit f71d833714c71aef244bea2fdcdce5ef8c254068.