Revert d53b147..6dec4d9

This rolls back to commit d53b14751a7bf475447af7995a42e1a97b2aa049.