Revert dc1f364..dbd3393

This rolls back to commit dc1f3648f31b7582353562545c1c0bca0fa3a809.