reverted last commit, not a fix. related #1308
reverted last commit, not a fix. related #1308