am: 207d325 * commit '207d325c52b94f61a4ad645597fe88ef7374708d': Clean-up a workaround that is no longer necessary.
207d325