Revert "Merge pull request #2516 from Rodsevich/master"

This reverts commit 30e94df4fbae571890bf186fca1598a6ff2797c4, reversing
changes made to 67e2cd6074876e423be8dd59bd76a6d71849544e.