Revert 95ebd6e..82c0df8

This rolls back to commit 95ebd6ef8b766bf14a052241f71fcc78ea4a69f5.