reverting #248 because it isn't needed with this change