Revert 568cecb..d9cbd1e

This rolls back to commit 568cecb72f3410d8adf8340fe6a3fd0c1a44816a.