Revert 5eb6dec..10dd020

This rolls back to commit 5eb6decca6c89854c55c8d7b5c59b8866b7967bd.