Reverting 'fix' for issue #28