Revert d58e314..946921a

This rolls back to commit d58e314889474740d003c0c6ff116d4f1cba207e.