reverting the attempted #28 fix