Revert 9cd7699..c175147

This rolls back to commit 9cd7699e0b797056463b8a3d443a3b3e37ebd628.