Revert 0e7bcca..dd588a0

This rolls back to commit 0e7bccaead04b1a8e66f07d32944fc040707d573.