For Simon
Revert "For Simon"

This reverts commit 94a6188fde246310695a252825f9a2c5e3516cd7.