Revert 50e4443..dfed244

This rolls back to commit 50e44438fb9e02e226baa13bc726cb8892983deb.