Revert d731fbe..2f16b8d

This rolls back to commit d731fbe90d32d4967b5a0c467341a9fa33d1b26d.