Revert 1530c16..89dacbd

This rolls back to commit 1530c165ae8e61536881c0c55083748748fb0773.
Backup commit