Revert "Work in progress"

This reverts commit eb42cb3ad426002c9d021086e681d64f189cf422.