Revert "v0.518"

This reverts commit 5fca54031c123b4ff7c00501980d29bf4d4b5019.