Revert fb1ecd3..289110d

This rolls back to commit fb1ecd3f7246dacd844e568d61215d79c0600f5a.