Revert 2dc3360..270367a

This rolls back to commit 2dc33608be4ba7ce6fff69d8a7ac59b96ae7b792.