Revert a6dac04..478dfdb

This rolls back to commit a6dac044435a1493e75f3b8753da57a21e135b9d.