Revert 79bec0c..6c54f5e

This rolls back to commit 79bec0cafa131f805e4f697d75a157aed4daf3e9.