Revert f57816b..cedf034

This rolls back to commit f57816bfb2b140e1b853a12172af0662bb3c23db.
v0.3