Revert 18bf966..5db580e

This rolls back to commit 18bf966a4604f7bb3f3ff490ec5d1716605db01a.