Revert d63f662..6f2f248

This rolls back to commit d63f6626d61388cccc456dd76abc6b111dfa2ff7.