Revert b0f1df3..6c1d378

This rolls back to commit b0f1df306c9fbc020329b001e52c81335aeee527.