Adopt new push behaviour of default simple