Revert b5bb459..50748ed

This rolls back to commit b5bb459bd42a20c92a386fcce01e3cee3e053631.
(c) and data