Revert 0b9c50b..ddec0a4

This rolls back to commit 0b9c50b7f7183c9ff1bdfc45ac2635d4846f8424.