Revert aa32693..49742c5

This rolls back to commit aa32693f705028ab6f81bbeee0a812d9cd85eed9.