Revert f35a95c..4cf715e

This rolls back to commit f35a95c6338f5665bca6c9c3b9232397bd99887a.