Revert "Merge remote-tracking branch 'ahn/master'"

This reverts commit 5dcc99a778b9961a70cc0365e53c9bf050391234, reversing
changes made to 14eb3080c466c5a9969cad31bc34cbb867b54ea4.