Revert 85b7908..df7352a

This rolls back to commit 85b7908e08feaf3155d9ac04c21c483b155bf43f.